diff --git a/static/css/style.less b/static/css/style.less
index ed0d5a7..aa0c27c 100644
--- a/static/css/style.less
+++ b/static/css/style.less
@@ -42,7 +42,7 @@
     padding: 40px;
     text-align: center;
 
-    h1 {
+    h2 {
       margin: 15px 0 5px 0;
     }
 
@@ -93,7 +93,7 @@
     }
 
     div#article_text {
-      line-height: 1.5em;
+      line-height: 1.375em;
       a {
         text-decoration: underline;
       }
@@ -162,7 +162,7 @@
   div#ending_message {
     padding: 0 40px 0 40px;
     font-color: @light-grey;
-    font-size: 0.75em;
+    font-size: 0.675em;
   }
 }
 
@@ -175,7 +175,7 @@
     left: 0;
     border-right: @light-grey 1px solid;
 
-    h1 {
+    h2 {
       margin: 10px 0 0 0;
     }
 
diff --git a/templates/archives.html b/templates/archives.html
index 498a3c0..84828fd 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Archives{% endblock %}
+
 {% block content %}
 <article>
   <div id="article_text">
diff --git a/templates/article.html b/templates/article.html
index 9417a68..e33317d 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -2,9 +2,11 @@
 {% block head %}
 <meta name="keywords" content="{{ article.tags|join(', ')  }}">
 {% endblock %}
+
 {% block title %}{{ article.title }}{% endblock %}
+
 {% block header %}
-Posted on {{ article.locale_date }}
+<p>Posted on {{ article.locale_date }}</p>
 {% endblock %}
 
 {% block content %}
@@ -12,11 +14,9 @@
   <div id="article_title">
     <h3><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark">{{ article.title }}</a></h3>
   </div>
-
   <div id="article_text">
     {{ article.content }}
   </div>
-
   <div id="article_meta">
     <p>Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></p>
     {% if article.tags %}
@@ -31,5 +31,5 @@
 {% endblock %}
 
 {% block footer %}
-<a href="{{ SITEURL }}/" class="button_accent">&larr; Back to Index</a>
+<p><a href="{{ SITEURL }}/" class="button_accent">&larr; Back to Index</a></p>
 {% endblock %}
diff --git a/templates/author.html b/templates/author.html
index f729e3b..e9c3c81 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -1,5 +1,6 @@
 {% extends "index.html" %}
 {% block title %}Author: {{ author }}{% endblock %}
+
 {% block header %}
-Author: {{ author }}
+<p>Author: {{ author }}</p>
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 6a137ef..79a6a3e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,7 +24,9 @@
   {% block head %}
   {% endblock %}
 
-  <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
+  <title>
+    {% block title %}{{ SITENAME }}{% endblock %}
+  </title>
 
   {% include "analytics.html" %}
 </head>
@@ -39,17 +41,15 @@
         <img src="{{ SITEURL }}/theme/images/logo.png" alt="logo">
         {% endif %}
       </a>
-      <h1><a href="{{ SITEURL }}">{{ AUTHOR }}</a></h1>
+      <h2><a href="{{ SITEURL }}">{{ AUTHOR }}</a></h2>
       <p>{{ TAGLINE }}</p>
       <ul>
         {% for title, link in MENUITEMS %}
         <li><a href="{{ link }}">{{ title }}</a></li>
         {% endfor %}
-        {% if DISPLAY_PAGES_ON_MENU %}
-        {% for p in pages %}
-        <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
-        {% endfor %}
-        {% endif %}
+        {% if DISPLAY_PAGES_ON_MENU %}{% for p in pages %}
+        <li><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+        {% endfor %}{% endif %}
         {% for name, link in LINKS %}
         <li><a href="{{ link }}" target="_blank">{{ name }}</a></li>
         {% endfor %}
@@ -62,17 +62,17 @@
 
   <main>
     <header>
+      {% block header %}
       <p>
-        {% block header %}
-        <a href="{{ SITEURL }}">Index</a> &#124; <a href="{{ SITEURL }}/archives.html">Archives</a>
-        {% if FEED_ALL_ATOM %}
-        &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
-        {% endif %}
-        {% if FEED_ALL_RSS %}
-        &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
-        {% endif %}
-        {% endblock header %}
+      <a href="{{ SITEURL }}">Index</a> &#124; <a href="{{ SITEURL }}/archives.html">Archives</a>
+      {% if FEED_ALL_ATOM %}
+      &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
+      {% endif %}
+      {% if FEED_ALL_RSS %}
+      &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
+      {% endif %}
       </p>
+      {% endblock header %}
     </header>
 
     {% block content %}
@@ -84,7 +84,7 @@
     </footer>
 
     <div id="ending_message">
-      <p>&copy Giulio Fidente. Built using <a href="http://getpelican.com" target="_blank">Pelican</a>. Fork the blog theme <a href="https://github.com/giulivo/pelican-svbhack" target="_blank">on github</a>.</p>
+      <p>&copy Giulio Fidente. Built using <a href="http://getpelican.com" target="_blank">Pelican</a>. You can fork the theme on <a href="https://github.com/giulivo/pelican-svbhack" target="_blank">github</a>.</p>
     </div>
   </main>
 </body>
diff --git a/templates/categories.html b/templates/categories.html
index 871964e..60bdf02 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Categories{% endblock %}
+
 {% block content %}
 <article>
   <div id="article_text">
diff --git a/templates/category.html b/templates/category.html
index c335d69..0e7711c 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -1,5 +1,6 @@
 {% extends "index.html" %}
 {% block title %}Category: {{ category }}{% endblock %}
+
 {% block head %}
 {% if CATEGORY_FEED_ATOM %}
 <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ category }} Category Atom Feed" />
@@ -8,12 +9,13 @@
 <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} {{ category }} Category RSS Feed" />
 {% endif %}
 {% endblock %}
+
 {% block header %}
-Category: {{ category }}
+<p>Category: {{ category }}
 {% if CATEGORY_FEED_ATOM %}
 &#124; <a href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}">Atom Feed</a>
 {% endif %}
 {% if CATEGORY_FEED_RSS %}
 &#124; <a href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}">RSS Feed</a>
-{% endif %}
+{% endif %}</p>
 {% endblock %}
diff --git a/templates/index.html b/templates/index.html
index 50c1296..b798063 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,7 +3,7 @@
 {% for article in articles_page.object_list %}
 <article>
   <div id="article_title">
-    <h3><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark">{{ article.title }}</a></h3>
+    <h3><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h3>
   </div>
   <div id="article_text">
     {{ article.summary }}
diff --git a/templates/page.html b/templates/page.html
index a2945ed..ffd4686 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,7 +1,8 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{% endblock %}
+
 {% block header %}
-{{ page.title }
+<p>{{ page.title }</p>
 {% endblock %}
 
 {% block content %}
@@ -16,5 +17,5 @@
 {% endblock %}
 
 {% block footer %}
-<a href="{{ SITEURL }}/" class="button_accent">&larr; Back to Index</a>
+<p><a href="{{ SITEURL }}/" class="button_accent">&larr; Back to Index</a></p>
 {% endblock %}
diff --git a/templates/pagination.html b/templates/pagination.html
index 011129e..6f20b0f 100644
--- a/templates/pagination.html
+++ b/templates/pagination.html
@@ -1,6 +1,5 @@
 {% if DEFAULT_PAGINATION %}
 <p id="paginator">
-
 {% if articles_page.has_next() %}
 <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" class="button_accent">&larr; Older Posts</a>
 {% endif %}
@@ -12,6 +11,5 @@
 <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html" class="button_accent">Newer Posts &rarr;</a>
 {% endif %}
 {% endif %}
-
 </p>
 {% endif %}
diff --git a/templates/tag.html b/templates/tag.html
index 33ec583..00cca39 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -1,5 +1,6 @@
 {% extends "index.html" %}
 {% block title %}Tag: {{ tag }}{% endblock %}
+
 {% block head %}
 {% if TAG_FEED_ATOM %}
 <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag Atom Feed" />
@@ -8,12 +9,13 @@
 <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag RSS Feed" />
 {% endif %}
 {% endblock %}
+
 {% block header %}
-Tag: {{ tag }}
+<p>Tag: {{ tag }}
 {% if TAG_FEED_ATOM %}
 &#124; <a href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}">Atom Feed</a>
 {% endif %}
 {% if TAG_FEED_RSS %}
 &#124; <a href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}">RSS Feed</a>
-{% endif %}
+{% endif %}</p>
 {% endblock %}
diff --git a/templates/tags.html b/templates/tags.html
index b08aae2..12dee12 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,11 +1,12 @@
 {% extends "base.html" %}
 {% block title %}Tags{% endblock %}
+
 {% block content %}
 <article>
   <div id="article_text">
     <ul>
       {% for tag in tag_cloud %}
-      <li><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li>
+      <li><a href="{{ SITEURL }}/tag/{{ tag.0|string|replace(" ", "-" ) }}.html">{{ tag.0 }}</a></li>
       {% endfor %}
     </ul>
   </div>